Cleanup and feature add