Cleaning up parser utility