Cleaned up code and modified DB and MainActivity