changed tabs to 4 spaces and some clean up