code cleanup
merged with trunk
Merge pull request #23 from mikejuyoon/justin-working

Justin working