compiler source 1.7 & cleanup