Small changes to follow Some java rules better and remove redundant task...

Small changes didn't too too much editing but made it more to Java rule specs and simplified the coding to remove redundant checks and simplify your life.

~Lovely Plugin