Better formating and more comments