Changed according (most of) comments from review