Clarify naming conventions
Re-organize utility functions