Reformatting core module code