Fix spacing, remove unnecessary comments