Clean up some codethings
There's no way this was working before