Formatted and commented some more