Tidy up baselinecommand