Just cleaned small things to be more readable