[#33] Refactoring parser functions