fix indentation & remove more specific things!