Refactor a bit and rename things