More legibility issues
Removed repeated code i.e. extra baggage