Clean up, make code (a little) clearer