Basic cleanup & optimisation 1/3

See ToDo