Cleaned up form and converted to partial