Processing Scrutinizer Feedback

Processed the sensible remarks.