finished polishing and code refactoring