Refactored a bit
Implemented a command-line flag to show built-in PTS instances