Fixed some CS and removed some unused variables