Changed controllers to follow array-style injection format as this is good practice