refactoring, delete comments, add table application