Some minor updates and cleaning