Refactors

Merged Paul Pestov requested to merge refactors into develop

some refactors for better readability

Merge request reports