Options made internal
Small cleanup