[minor] cleanup. Making code smallerr