Fix indentation

Indentation was kind of messy mixing tabs and spaces. This also remove some trailing white spaces.