Minor formatting fixes and some merge testing

1. Added using derectives inside the namespaces
2. Removed unnecessary using-s