commit for merge
merging and cleaning up code