little refactoring
devesh's laptop changes merged