compact things
Merge pull request #19 from ordrin/dev_polina

compact things