Made some minor optimizations and took out personal info