Cleaned up form submission a bit