Issue #204 & #229 fixing indextations