Remove watch, unnecessary functions and rename variable