Beautified

Finally code is readable on github, or it should be since I haven't yet
committed and synced.