Cleaned up new user code block.