Clean up + initial stab at lfm