Refactoring S-exp

Use primitive wrapper class.