Code cleanup. Added noexcept for some methods.