Cleaned up all the code

Change-Id: Ic2ee1cfcbd249defa0fc7d6828028c2a295dd693