moved includes to header file, formatting, getting rid of legacy
Moved some calculations in dedicated, const functions
re-activated print function