Some refactoring. Eliminate unneeded method into beautiful one liner