Learn everything that Pavel Pimenov committed
Code cleanup