Small bugfix, and indentation changes