Changes as per the human stylecop