More styling, doc and cleanup