added some brackets to help the minifier tools
improved memory usage, especially on data removal