Merge pull request #2580 from neilLasrado/dirty-code

dirty code cleanup