2 space indentation

i humbly request this PR that removes some trailing spaces and converts 4 space indentation to 2.