Added comment headers to *.h; Formatting