clean up inputs, set input, enum for names