Added NonCopyable class and did minor cleanup.