Modified functions to meet style guide specs