DAL: Tidyup of classes. Removed commented out code, unused imports,
pointless brackets, etc