Keep targeting in one file

Also clean up some style issues