variours methods, code cleaning