Tried to make better form