Code cleanup

Minor cleanup: Indenting and True/False simplification