Removed irrelevant code, making the API clearer