Merge pull request #11 from mkalb/warnAndStyle

Optimize imports and resolve warnings from IDEA