Cleanup

Just some light cleanup.