Droping novinkines table, small refactoring