Cleanup the code: styling