Fix spelling error and cleanup