Updated docs and cleaned Application main