Cleaned up a little bit

Next thing I will try to do unless advised otherwise is to get the
screen diming/brightening effect down for lighting.