Better names
Several code refactors (WIP) not tested nor compiled