Modified tab/space indenting, minor syntax issues