Cleaned some of the Option nesting
Cleaned up the logging