Optimizations

Updated my commit e-mail.