Refactorings according to beanstalk environment