General code cleaning
Initial release