amend previous commit
code cleanup, preparation to reinit ;)