Formatting, removed unneccessary comments