Cleaned up your code and removed databases