Code cleanup: removed unnecessary comment
Removed unused import, fixed formatting and improved one comment
Removed a duplicated call to the prepare method