changing tab settings to use 2 spaces, formatting what I've done
fixing more code styling