fine-tune code, remove comments