HV-818 static methods overrides fix
HV-818 Formatting, improving naming, adding method comment