Refactoring, optimizing and adding public method system.