simplifying cmd line args
db refactoring
formatting