Refactoring cloud9...