cleanups and polishing
cleanup & polishing