remove macro, fix indentation