Spacing / Removed comments