Nitpicky stuff

Standardized layout, whitespace, indentations. Removed tabs in favor of four spaces. Properly encapsulated variables and added getter methods.