Make this more organized