reducing unnecessary changes and debugger statements