refactoring, removed poinless classes and changed names from polish to english