Initial commit
Cleaned up code