Cleanup alpha

For Issue #108