Initial import
Some code cleaning