Small fixes and cleaning

Small fixes and cleaning