Minor stuff fixed, based on colleagues notices + changed code theme to light one