Removed old revision
Removed copypasta-typo
Minor refactoring incl. mozorov