Fixed indentation, colon spacing

- Also removed some lines that began with # - were they supposed to be
  comments?