Cleanup

Some cleanup and changed tabs to 4 spaces