Cleaned up private methods.