more code cleanup lolll