more code cleanup… there seem to be random lagspikes, not sure if that’s my computer