Removing warnings and renaming methods.