Bit more code cleaning