Fixed indentation, cleaned up errors from merge