Continued cleanup for easier implementation