cleaned up some light code