Refactor, cleanup and new features

* Implemented threaded key listing
* Added fast list mode support
* Removed some dead code
* Cleaned up syntax