removed some new lines/unnecessary comments