some refactoring, renaming. body source checks
some refactoring, renaming. body source checks