Removed old form, correct coding standards.