Fix indentation, add profiling points