Removed unnessecary lines, rearranged code slightly in Database class