Formatting, adding argument for speed, removing soft flow control