Improve interface; slim down document size