removed whitespace + long line warnings