Tiny bit of cleanup, fix light bug