Simplifying naming conventions. while adding comments and additional functionality