Fixed indentation, removed debug stuff