Whitespace and renamed methods