clean ups
Merge pull request #400 from cordoval/cleanups

clean ups