removing unnecessary styles
removing unused variables