Little cleanup of code.