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