small updates to performance/cleanly code