Streamlined some methods.