Refactor so that rotation is not done via static call