Commented and removed fluff