#10 : Improve code base.