#280 #151 applying code conventions