Fixed formatting (again), removed some unneccesary code. Also tweaked some data handling/storage.