Followed proper naming conventions