Clean up

- Also, camera using integer coordinates