Review. Functionality complete

Left some remarks on the style.