Cleanup

Cleanup in some variables definitions, after some of previous chrashfix
attempt