Cleaning Business classes code