[minor] Cleaning up the code