Formatted a few things and added/removed comments