Initial commit
Clean up, formatting