(change:minor) Code clean-up