prettification

merged with Darya's branch