revomed unused variables and indentation
removed dependency on user on-startup settings