TEST - Increased code readablility