Make parsing methods static
Add whitespace