Random cleanup mostly
Random cleanup mostly