updated based off feedback from checkstyles