Changed indentation, commenting & documentation