Applying CS fixes as discussed with @DASPRiD on IRC