Increase indentation throughout file for clarity. Correct mistakes. Shorten lines. Make more consistent

Signed-off-by: Craig Robbins <kde.psych@gmail.com>