Commited final reformatted code