code cleanup java 8