Separate out method parse - cleaner