General code cleanup -- removed verbose code