Fix identation + minor stuff
merge