cleaning up convensions a bit