Removing pointless function, and bad linebreak