Fix last measure update & Change indents to spaces