clean up. removed all wrappers, better styling