Edited JSON files and cleaned up controllers