Code clean-up (deleted unused imports, added comments, removed commented
code)