Changed tabs for spaces, adjusted alignment
Broke several definitions over multiple lines for ease of reading