Cleanup

Cleaned up before merging with master