Slightly improve form