Fixes more code style and removes unnecessary string concatenation.