Initial commit

Did a little cleanup

Change-Id: Iafe659c0080482f78b8651eff53df3ef3c4c7414