Slight cluter cleanup
Added Options
Added Options