Cleaned up aes.go, made it more consistent