Cleanup code

Always use property, not _ivar. Added marks