refactor, using 2 lines methods