First commit

Basic cleanup and changes