Work on Modern Fence + format + organize import