refactoring(static class Parser) and cleanup