Light cleanup

Just cleaning up the code.