Minor Changes

*Fixed unused imports and parameters
*Changed list and matrix declarations