[minor] comments and cleanup