Moving to new line and removing unused function