CHANGED:clean up the code with pre-defined UI elements variable names