Improved Database Access
More cleaning