making it more organized