Code cleanup, set compiler to 1.6