[OTHER] cleanup and comments