cleaned up form a bit