Issue #10 - Makes the file parsing more readable