some cleaning to fit code conventions