Nick's changes/cleanup