adjusted content indentation project wide + minor header cleanup