Commit

Code cleanup