Cleanup

Cleanup and changed tabs to 4 spaces