reorganizing and making it pretty