fixed spinner
removed unused variables