Cleaning up console statements