Cleanup of using statements, added some comments