More improvements style code.