code cleanup
Merge pull request #1 from cybermerc/cleanup

code cleanup