Cleanup and add as feature