Added cleanup code
Added Scene class to manage the scene