Alpha v0.5 release candidate 2

Fixed my indenting and identifier etiquette. Removed the unnecessary
variables and redundant functions. This version serves as the second
release candidate and will server as the initial base of the web based
version.