Created cleaner controller and service syntax