Polishing, update dependencies, cleanup