Cleaning up the code, completely separated display functionality and calculation functionality. Renamed a LOT of variables.