Applied comments suggested by Scrutinizer