Removed shitty comments and renamed a namespace