Changed formatting, added comments