Code convention improvements

format code