Added formatting control from Eclipse