cleanup for easier usage