Formatting

Changed formatting and removed irrelevant comments