Cleaned up code, introduced new methods for getting data from JSONs to avoid code repetition