massive clean up -- atomic commits ftw!