Formatting, removing main method