clean up code base
Merge pull request #57 from therobinkim/meteor

clean up code base