Const correctness
Name refactoring
Better resource handling (WIP)