Namespace P created
Cleaned up for readability