resolve indentation + remove hardcode 1000