Cleaned up some code. prepping for new options creation