more clean up for the beginner guide