Formatting/Clean up/Organize imports
Remove unncessary else