Removed unused options
Fixed whitespace