Updated Some Var and Functions

Updated some variables and functions as well as delete some unnecessary
coding. Going to test the progress as of now.