cleanup sources
cleanup
migrate to jdk8 (format)