Fixed indentation, clean-up