Addressed the rest of the feedback