Fixed #21 and indenting