Cleaned Mascarade code.