1.1 and 1.2

-struct now only for class where it really use
- added extra spaces
- deleted one gimmicky variable