Minor debug and cleaning