Added maven, small cleanup.