clean code
clean code: reduce complexity in application controller