go static!
refactoring, javadocs