#35764 @0.12 Refactored and commented all methods

Code Review