updated based off coding standards