clean up and chage styles