Cleaning up some business layer methods