Added Qualifier spinner listener, clean up some source code