added debian server view, clean up code