Cleaned code

Minor formatting changes, e.g. consistent indentation