Minor indentation & structure fixes