Images added and a bit of codeconvention applied