Code clean-up

[takemyoxygen]

1. [ ] Null-checks when serializing
2. [ ] Remove unused namespaces
3. [ ] Fix compiler warnings related to not checked patterns
4. [ ] Comments
5. [ ] Use long module names instead of having both namespace and module declarations