Clean up unecessary logic, move data into single place