improving namespace usage and requires