Use eclipse to unify format and perform a source cleanup

Change-Id: Ib01a5cd5ae5f9d74f8f7edc23b522777db207c64