Got rid of nasty hacks

The core is now 32 lines only. Amazing!