Don't use single line conditional statements, please move the return to the next line. Same below.
Spacing