Removed whitespaces to prevent more merge conflicts