Finished testing source versions; minor refactoring