Removed loads of whitespace