cleanup and fix getting options
whitespace cleanup