git ignore
if statement optimization
oo optimizations

public/private changes
remove unused code, fix setupDatabase()