Performed code sectioning, code restructuring, looks nicer now