Bidirectional cleanup

Non code changes, only format and indent code  for improve readability and practice (create branch, modify, merge, etc..)