Remove one line methods and classes

One line methods and classes make it more cumbersome to make changes, and are more difficult to read.