MINOR: code cleanup