Removed @ from names. Clean-up.