Comments/remove unecessary space