Cleanup. Move variables block