Fixing some comments and prettyfying