Refactoring style as suggested by #7