Cleaned up form