Fix minor formatting issues + use dict literal