clean up comments and update layouts