cleanup, java 7 features
cleanup, java 7 features