maven, resolved errors, etc
refactor
refactor