Removing prefixes from method names
Removing unused var assignment
Minor inline docs change to comply with standards