Minor style and location tweaks
Initial (modified version of needed.rb that simplifies things)