Fix comment
Code cleanup