Refactor, commenting, polishing.