Addressed suggestions from last commit