Reverted import removal, reformatted an if-else