Cleaned code
Fixed warnings/hints from IDEA