Started with refactoring repositories and controllers for cleaner code