Fix task 03, 06, remove namespace

See the individual commits for details