commited changes
Code clean up