fixed trailing whitespace & redundant using clause