* beautied code slightly