Code style tweaks and break chens stuff into sensible slides