cleanup app class a bit more