refactor dumb stuff