cleaned up input form