Minor fix and some stile corrections