Form 2 cleaned up