updated to remove warnings and notes from clang compiler