Making namespace code cleaner
Adding doc blocks