removing debug and unnecessary comments