Clean up moreeeee