Clean up and adding features