clean up code and change signup