Added some format and less code...