small improvments and better formatting