Organize imports
Removed unused variables.
No need to return a unmodifiable list
Added TODO
Merge pull request #135 from iceglow/cleanup

Corrected some violations.