Cleaned up code

Follow
https://docs.google.com/document/d/1fvBrv7V6l1otMAE2bPgRwPKO9p6Ma0EwHYh3nkZojeU/edit?usp=sharing
code formatting.