Implement maven and a small cleanup.