formatting sources and update to mc 1.6