rework variable declarations