Clean up and scala doc