Don't use explicit return at end of methjod
Shorten line
Fix styling