Some reorganizing and better choices