Whitespace tidying
Updated make options