fixing some redundant variables
removing unnecessary import
lotta code cleanup