Cleanup and symplification