Changed Format

Cleaner code