[Refactoring] Code cleanup and remove duplicate methods