Cleanup in src/compositor/

This PR does some cleanup in `src/compositor/`.
Woud put an `and` here. You may omit the `,`