fixed spacing and removed unused variables, needs styling now