fix: final code editing, comment polishment
