Changed return types on remove methods and minor naming fixes.