misc: small fix or general refactoring i did not bother commenting

session/session.go

@@ -95,13 +95,22 @@ type Session struct {
 }
 
 func New() (*Session, error) {
-	var err error
+	opts, err := core.ParseOptions()
+	if err != nil {
+		return nil, err
+	}
+
+	if *opts.NoColors || !tui.Effects() {
+		tui.Disable()
+		log.NoEffects = true
+	}
 
 	s := &Session{
-		Prompt: NewPrompt(),
-		Env:    nil,
-		Active: false,
-		Queue:  nil,
+		Prompt:  NewPrompt(),
+		Options: opts,
+		Env:     nil,
+		Active:  false,
+		Queue:   nil,
 
 		CoreHandlers:   make([]CommandHandler, 0),
 		Modules:        make([]Module, 0),
@@ -109,15 +118,6 @@ func New() (*Session, error) {
 		UnkCmdCallback: nil,
 	}
 
-	if s.Options, err = core.ParseOptions(); err != nil {
-		return nil, err
-	}
-
-	if *s.Options.NoColors || !tui.Effects() {
-		tui.Disable()
-		log.NoEffects = true
-	}
-
 	if *s.Options.CpuProfile != "" {
 		if f, err := os.Create(*s.Options.CpuProfile); err != nil {
 			return nil, err