[swt]: faster indexing
[swt]: minor cleanup