Some light cleanup
Further light cleanup
Completed light cleanup