bit more code cleanup yo