Made Disposable follow coding guidelines