Small cleanup + stupid fix