+ code hygiene (fixed all warnings, removed borked functionality)