Restructure option management code to separate section