Lowercasing variables; removing unused import; replacing _remove by _mask