Excel file polishing
A bit of housekeeping + Buffered components+tests