Fixed issue: Cleanup code, fixed messages