Fixed: newlines
Fixed: some PMD warnings