just cleaning stuff
merging code with Raul's
Merge pull request #1 from jhnching/cleaning

just cleaning stuff