- added swizzling helper
- code cleanup