Initial commit
Code cleanup