Refactored DB getters and setters, commented code, refactored some code logic