code lean up