Fixed indention
Fixed some issues reported by phpcs
Removed `else` after a return
Fixed indention
Fixed some issues reported by phpcs
Removed `else` after a return