Revert "Deleting more code from chunk. I think the new code may look a bit uglier I don't know..."

This reverts commit 94b66293199c2caac165e939f68671e884137251.

I decided that it makes the code slightly less readable.
Fixed the release configuration of the project.