Minor cleanup for readability

Minor cleanups - break some long statements into multiple lines. Remove comment that marked as to be removed.