Added gravity clone + Code cleanup