Cleanup & improvements