Reordered imports
Removed empty return
Fix identation