small code improvements

removed unecessary variables and methods;
improved text_button constructors