Clean up and add features