clean up all basic

cleaned up some indentation levels and syntax and alignments